Fix positioning near the monitor boundaries. (#154341, Ken Harris)

2004-10-03  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtktreeview.c (gtk_tree_view_search_position_func):
	Fix positioning near the monitor boundaries.  (#154341,
	Ken Harris)

diff --git a/ChangeLog b/ChangeLog
index afd850abcbe054a9b5c680e9ff1a924a8f30c228..8fe5b8b55c17f8f594f8edcc8b811518423adee1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-10-03  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtktreeview.c (gtk_tree_view_search_position_func): 
+       Fix positioning near the monitor boundaries.  (#154341,
+       Ken Harris)
+
 2004-10-01  Paolo Borelli  <pborelli@katamail.com>
 
        * gtk/gtkmenutoolbutton.c: deactivate the menu before setiing it
@@ -51,6 +57,7 @@
        call layout_clear_attributes, and also delegate calls to dependent
        cell layouts.  (#154191, Martyn Russell)
 
+>>>>>>> 1.5869
 2004-10-01  Matthias Clasen  <mclasen@redhat.com>
 
        * modules/input/iminuktitut.c: Fix the spelling of Inuktitut

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index afd850abcbe054a9b5c680e9ff1a924a8f30c228..8fe5b8b55c17f8f594f8edcc8b811518423adee1 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2004-10-03  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtktreeview.c (gtk_tree_view_search_position_func): 
+       Fix positioning near the monitor boundaries.  (#154341,
+       Ken Harris)
+
 2004-10-01  Paolo Borelli  <pborelli@katamail.com>
 
        * gtk/gtkmenutoolbutton.c: deactivate the menu before setiing it
@@ -51,6 +57,7 @@
        call layout_clear_attributes, and also delegate calls to dependent
        cell layouts.  (#154191, Martyn Russell)
 
+>>>>>>> 1.5869
 2004-10-01  Matthias Clasen  <mclasen@redhat.com>
 
        * modules/input/iminuktitut.c: Fix the spelling of Inuktitut

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index afd850abcbe054a9b5c680e9ff1a924a8f30c228..8fe5b8b55c17f8f594f8edcc8b811518423adee1 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+2004-10-03  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtktreeview.c (gtk_tree_view_search_position_func): 
+       Fix positioning near the monitor boundaries.  (#154341,
+       Ken Harris)
+
 2004-10-01  Paolo Borelli  <pborelli@katamail.com>
 
        * gtk/gtkmenutoolbutton.c: deactivate the menu before setiing it
@@ -51,6 +57,7 @@
        call layout_clear_attributes, and also delegate calls to dependent
        cell layouts.  (#154191, Martyn Russell)
 
+>>>>>>> 1.5869
 2004-10-01  Matthias Clasen  <mclasen@redhat.com>
 
        * modules/input/iminuktitut.c: Fix the spelling of Inuktitut

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index afd850abcbe054a9b5c680e9ff1a924a8f30c228..8fe5b8b55c17f8f594f8edcc8b811518423adee1 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2004-10-03  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtktreeview.c (gtk_tree_view_search_position_func): 
+       Fix positioning near the monitor boundaries.  (#154341,
+       Ken Harris)
+
 2004-10-01  Paolo Borelli  <pborelli@katamail.com>
 
        * gtk/gtkmenutoolbutton.c: deactivate the menu before setiing it
@@ -51,6 +57,7 @@
        call layout_clear_attributes, and also delegate calls to dependent
        cell layouts.  (#154191, Martyn Russell)
 
+>>>>>>> 1.5869
 2004-10-01  Matthias Clasen  <mclasen@redhat.com>
 
        * modules/input/iminuktitut.c: Fix the spelling of Inuktitut

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 32cc7944e8039c1cc0f75c6c81ec90bf70c13ec5..3f42c08f8c813a5723f932b6aa2030467f1e0e59 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -12266,6 +12266,11 @@ gtk_tree_view_search_position_func (GtkTreeView *tree_view,
   GdkWindow *tree_window = GTK_WIDGET (tree_view)->window;
   GdkScreen *screen = gdk_drawable_get_screen (tree_window);
   GtkRequisition requisition;
+  gint monitor_num;
+  GdkRectangle monitor;
+
+  monitor_num = gdk_screen_get_monitor_at_window (screen, tree_window);
+  gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor);
 
   gtk_widget_realize (search_dialog);